Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #163 #164

Merged
merged 3 commits into from
Jan 8, 2024
Merged

Fix #163 #164

merged 3 commits into from
Jan 8, 2024

Conversation

whiterabbit963
Copy link
Collaborator

I also included a skill id typo on the warden skill "Appell in Thal".

@whiterabbit963 whiterabbit963 changed the title Fix 163 Fix #163 Jan 8, 2024
@wduda wduda changed the base branch from main to version1.4 January 8, 2024 08:28
@wduda wduda merged commit c2dd32f into wduda:version1.4 Jan 8, 2024
wduda added a commit that referenced this pull request Jan 8, 2024
* Fix #163 (#164)

* fix warden skill id typo

* fix invalid member access in CheckSkills()

* fix #163, on OptionsPanel checkskills() access

---------

Co-authored-by: whiterabbit963 <[email protected]>

* Map updates (#169)

* fix warden skill id typo

* fix invalid member access in CheckSkills()

* fix #163, on OptionsPanel checkskills() access

* fix various map window issues (#16)

Add missing map locations for reputation skills.
Combined Eriador, Rhovanion, Gondor, and Creeps into a single class.
Use a single list of locations since each location will generally
exist on a single map. Any exceptions can be handled in a one-off
manner.

* add coordinate display for debugging

* improve map window interactions

* move map windows into a single menu list

* improve handling of some map data errors

* add coordinates for Bloody Eagle Tavern

Shifted Umbar to improve alignment with the BE Tavern

* add skill id to mapwindow locations

This removes the requirement that the location indexes match the
dictionary ordering of skills. Further, it will allow for verification
of any mismatches between location and skill tables.
Those maps with skills on multiple maps have been integrated into
the table initialization statements.

* add startup checks to verify dictionary and map ids match

---------

Co-authored-by: whiterabbit963 <[email protected]>

* Fix #106 (#166)

* fix warden skill id typo

* fix invalid member access in CheckSkills()

* fix #163, on OptionsPanel checkskills() access

* fix various map window issues (#16)

Add missing map locations for reputation skills.
Combined Eriador, Rhovanion, Gondor, and Creeps into a single class.
Use a single list of locations since each location will generally
exist on a single map. Any exceptions can be handled in a one-off
manner.

* add coordinate display for debugging

* improve map window interactions

* move map windows into a single menu list

* improve handling of some map data errors

* add coordinates for Bloody Eagle Tavern

Shifted Umbar to improve alignment with the BE Tavern

* add skill id to mapwindow locations

This removes the requirement that the location indexes match the
dictionary ordering of skills. Further, it will allow for verification
of any mismatches between location and skill tables.
Those maps with skills on multiple maps have been integrated into
the table initialization statements.

* add startup checks to verify dictionary and map ids match

* fix travel button off screen on lower resolution change (#106)

---------

Co-authored-by: whiterabbit963 <[email protected]>

* fixing typo in creep map shortcut population

* some small static code analysis improvements

* v1.4.0 metadata

---------

Co-authored-by: whiterabbit963 <[email protected]>
Co-authored-by: whiterabbit963 <[email protected]>
@whiterabbit963 whiterabbit963 deleted the fix_163 branch January 9, 2024 01:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants